From 484936eb04c923ef58c3d9fc57252eebd30a1e52 Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Tue, 31 Mar 2009 17:09:29 +0000 Subject: [PATCH] Don't use depecrated features or reduntant declarations in Makefile.am Patch from Gary V. Vaughan svn path=/trunk/; revision=405 --- ChangeLog | 10 ++++++++++ babl/Makefile.am | 7 ++++--- babl/base/Makefile.am | 4 ++-- docs/Makefile.am | 2 +- tests/.gitignore | 5 +++-- tests/Makefile.am | 18 +----------------- 6 files changed, 21 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93c8577..b1e555d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2009-03-25 Martin Nordholts + + Patch from Gary V. Vaughan. Don't use depecrated features or + reduntant declarations in Makefile.am + + * babl/Makefile.am + * babl/base/Makefile.am + * docs/Makefile.am + * tests/Makefile.am + 2009-03-25 Martin Nordholts Patch from Gary V. Vaughan. Support hpux use of shl load/unload diff --git a/babl/Makefile.am b/babl/Makefile.am index 25932bd..27580f4 100644 --- a/babl/Makefile.am +++ b/babl/Makefile.am @@ -56,9 +56,10 @@ library_include_HEADERS = \ babl-version.h \ babl.h -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/babl/base - -AM_CPPFLAGS = -DLIBDIR=\""$(libdir)"\" +AM_CPPFLAGS = \ + -DLIBDIR=\""$(libdir)"\" \ + -I$(top_srcdir) \ + -I$(top_srcdir)/babl/base lib_LTLIBRARIES= libbabl-@BABL_API_VERSION@.la libbabl_@BABL_API_VERSION@_la_SOURCES= $(h_sources) $(c_sources) diff --git a/babl/base/Makefile.am b/babl/base/Makefile.am index 4d85c50..1c1da0f 100644 --- a/babl/base/Makefile.am +++ b/babl/base/Makefile.am @@ -13,13 +13,13 @@ c_sources = \ model-gray.c \ model-ycbcr.c -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/babl +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl noinst_LTLIBRARIES= libbase.la libbase_la_SOURCES= $(h_sources) $(c_sources) +libbase_la_LIBADD = $(MATH_LIB) EXTRA_DIST = \ rgb-constants.h \ util.h -LDADD = $(MATH_LIB) diff --git a/docs/Makefile.am b/docs/Makefile.am index c8c2b5b..773d1ab 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,7 +1,7 @@ # programs used for doc creation babl_fish_path_dhtml = $(top_builddir)/tests/babl_fish_path_dhtml babl_fish_path_fitness = $(top_builddir)/tests/babl_fish_path_fitness -babl_html_dump = $(top_builddir)/tests/babl_html_dump +babl_html_dump = $(top_builddir)/tests/babl-html-dump .SILENT: SUBDIRS= graphics diff --git a/tests/.gitignore b/tests/.gitignore index f7e9645..c48e0f5 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1,7 +1,8 @@ -/Makefile -/Makefile.in /.deps /.libs +/Makefile +/Makefile.in +/babl-html-dump /babl_class_name /babl_fish_path_dhtml /babl_fish_path_fitness diff --git a/tests/Makefile.am b/tests/Makefile.am index 092f1f9..360906b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -10,18 +10,6 @@ TESTS = \ TESTS_ENVIRONMENT = BABL_PATH=$(top_builddir)/extensions/.libs -grayscale_to_rgb_SOURCES = grayscale_to_rgb.c -rgb_to_bgr_SOURCES = rgb_to_bgr.c -srgb_to_lab_u8_SOURCES = srgb_to_lab_u8.c -rgb_to_ycbcr_SOURCES = rgb_to_ycbcr.c -babl_class_name_SOURCES = babl_class_name.c -sanity_SOURCES = sanity.c -types_SOURCES = types.c -babl_fish_path_fitness_SOURCES = babl_fish_path_fitness.c -babl_fish_path_dhtml_SOURCES = babl_fish_path_dhtml.c -formats_SOURCES = formats.c -models_SOURCES = models.c - AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl LDADD = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ @@ -31,12 +19,8 @@ noinst_PROGRAMS = \ introspect \ babl_fish_path_fitness \ babl_fish_path_dhtml \ - babl_html_dump \ + babl-html-dump \ conversions \ formats \ nop \ $(TESTS) - -introspect_SOURCES = introspect.c -babl_html_dump_SOURCES = babl-html-dump.c -nop_SOURCES = nop.c -- 2.30.2